Skip to content

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5)#1597

Merged
svyatonik merged 33 commits into
masterfrom
bump-refs
Oct 20, 2022
Merged

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5)#1597
svyatonik merged 33 commits into
masterfrom
bump-refs

Conversation

@svyatonik
Copy link
Copy Markdown
Contributor

@svyatonik svyatonik commented Oct 10, 2022

WIP, just to show some progress
I'm trying to use Weight::from_ref_time(), Weight::ref_time() everywhere instead of expressions like Weight::zero() to make it easier to upgrade to Weights v2 after they'll be available

For the future me (or whoever will be working on upgrading from weights 1.5 to 2.0):

  1. grep for ref_time - all code needs to be double checked;
  2. there's a lot of things happening with weights in messages pallet and in messages relay. There are couple of places where we need to div weights - this op is currently unavailable (?). So all these things need to be rechecked and fixed;
  3. I guess there'll be a way to refund unused bandwidth component - we'll also need to do that in all our pallets

@svyatonik svyatonik added the dependencies Pull requests that update a dependency file label Oct 10, 2022
This was referenced Oct 17, 2022
@svyatonik svyatonik marked this pull request as ready for review October 19, 2022 07:59
@svyatonik svyatonik requested a review from serban300 October 19, 2022 07:59
@svyatonik
Copy link
Copy Markdown
Contributor Author

@bkontur @serban300 Let me know if you want this to be merged without waiting for this damned clippy check (hope it'll be fixed tomorrow). I know both of you (more or less) need this branch for your work. Once it is approved, I can merge with failing clippy

Comment thread Cargo.toml
substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
beefy-gadget = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges-2" }
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@svyatonik
this will stay as sv-locked-for-gav-xcm-v3-and-bridges-2 or sv-locked-for-gav-xcm-v3-and-bridges,
no problem with both, just asking

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR will be merged with -2, but in a follow up (quick) PR I'll change it back to our regular branches. An alternative would be me force-pushing to sv-locked-for-gav-xcm-v3-and-bridges and all our builds are failing until this PR will be merged.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(i.e. I want to minimize this all-builds-fail time by doing this)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, ok,
I am thinking, I am using sv-locked-for-gav-xcm-v3-and-bridges in Cumulus for patched dependencies also, so if sv-locked-for-gav-xcm-v3-and-bridges will move now, my unfinished Cumulus stuff wont compile :)
so I would like to leave sv-locked-for-gav-xcm-v3-and-bridges-2 in master for a while or till the time I will start update bko-origin/bridge-ro-wo and Cumulus, and once I am done, I can do that quick PR

and once I am done with Cumulus and updating

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I think I'll leave this PR for tomorrow - it may happen that it'll break bridges-ci/production tonight (if merged) and then we'll need to revert it, wait for another night and then remerge.

Copy link
Copy Markdown
Collaborator

@bkontur bkontur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slava, cool :),
I am ok with merge now or tomorrow,
I need to finish my stuff first, before I will start updating to this (probably tomorrow or friday),
so its up to you

Copy link
Copy Markdown
Collaborator

@serban300 serban300 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good ! I just left 1 nit.

Personally I'm ok with merging the PR now. However you prefer.

Comment thread modules/messages/src/lib.rs Outdated
@svyatonik svyatonik enabled auto-merge (squash) October 20, 2022 07:26
@svyatonik svyatonik merged commit 789f185 into master Oct 20, 2022
@svyatonik svyatonik deleted the bump-refs branch October 20, 2022 07:27
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Oct 27, 2022
jiguantong added a commit to darwinia-network/darwinia-parachain that referenced this pull request Nov 1, 2022
jiguantong added a commit to darwinia-network/darwinia-parachain that referenced this pull request Nov 1, 2022
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022
hackfisher pushed a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 21, 2022
* update substrate dep master > v0.9.30

* Companion for paritytech/parity-bridges-common#1589

* Companion for paritytech/parity-bridges-common#1593

* Companion for paritytech/parity-bridges-common#1478

* Companion for paritytech/parity-bridges-common#1596

* Companion for paritytech/parity-bridges-common#1600

* Companion for paritytech/parity-bridges-common#1603

* Companion for paritytech/parity-bridges-common#1604

* Companion for paritytech/parity-bridges-common#1597 part.1

* Companion for paritytech/parity-bridges-common#1597 part.2 update weights

* Companion for paritytech/parity-bridges-common#1597 part.3

* Companion for paritytech/parity-bridges-common#1597 part.4 fix compile

* clear unused imports

* Companion for paritytech/parity-bridges-common#1613 part.1 undone

* fix tests
jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 21, 2022
* update substrate dep master > v0.9.30

* Companion for paritytech/parity-bridges-common#1589

* Companion for paritytech/parity-bridges-common#1593

* Companion for paritytech/parity-bridges-common#1478

* Companion for paritytech/parity-bridges-common#1596

* Companion for paritytech/parity-bridges-common#1600

* Companion for paritytech/parity-bridges-common#1603

* Companion for paritytech/parity-bridges-common#1604

* Companion for paritytech/parity-bridges-common#1597 part.1

* Companion for paritytech/parity-bridges-common#1597 part.2 update weights

* Companion for paritytech/parity-bridges-common#1597 part.3

* Companion for paritytech/parity-bridges-common#1597 part.4 fix compile

* clear unused imports

* Companion for paritytech/parity-bridges-common#1613 part.1 undone

* fix tests
boundless-forest added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Jan 4, 2023
* Prepare polkadot v0.9.30 for darwinia-2.0 (#226)

* update substrate dep master > v0.9.30

* Companion for paritytech/parity-bridges-common#1589

* Companion for paritytech/parity-bridges-common#1593

* Companion for paritytech/parity-bridges-common#1478

* Companion for paritytech/parity-bridges-common#1596

* Companion for paritytech/parity-bridges-common#1600

* Companion for paritytech/parity-bridges-common#1603

* Companion for paritytech/parity-bridges-common#1604

* Companion for paritytech/parity-bridges-common#1597 part.1

* Companion for paritytech/parity-bridges-common#1597 part.2 update weights

* Companion for paritytech/parity-bridges-common#1597 part.3

* Companion for paritytech/parity-bridges-common#1597 part.4 fix compile

* clear unused imports

* Companion for paritytech/parity-bridges-common#1613 part.1 undone

* fix tests

* 0930 > master

* try fix CI

* fix CI

* Use `H160` as `AccountId` (#230)

* Use H160 in darwinia-core

* H256 > H160

* update moonbeam account

* Fix tests

* remove debug println

* Fix review

* Fix review

* Compatible `derive_account_id` (#234)

* new derive_account_id

* adjust

* add test

* Keep compatible of the derive way

* Fix test

* Update converter

* Self review

Co-authored-by: Aki Wu <aki.wu@itering.com>

* update cargo

* master -> polkadot-v0.9.30

Co-authored-by: bear <boundless.forest@outlook.com>
Co-authored-by: Aki Wu <aki.wu@itering.com>
svyatonik pushed a commit that referenced this pull request Jul 17, 2023
serban300 pushed a commit to serban300/parity-bridges-common that referenced this pull request Mar 27, 2024
)

* update Substrate + Polkadot + Cumulus refs

* Origin -> RuntimeOrigin

* weights v1.5

* update refs once again + `cargo test -p pallet-bridge-grandpa` works

* started work on `cargo test -p pallet-bridge-messages`

* cargo test -p pallet-bridge-relayers

* cargo test -p pallet-bridge-parachains

* cargo test -p millau-runtime

* cargo test -p bridge-runtime-common

* cargo test -p rialto-runtime

* cargo test -p rialto-parachain-runtime

* cargo test -p millau-bridge-node

* cargo test -p rialto-bridge-node

* cargo test -p rialto-parachain-collator

* cargo test -p messages-relay

* cargo test -p parachains-relay

* cargo test -p substrate-relay

* cargo test --all

* cargo check -p millau-runtime --locked --features runtime-benchmarks

* fix remaining test

* fmt

* try to allow clippy failure temporarily

* Revert "try to allow clippy failure temporarily"

This reverts commit d1b6593.

* use min_by

* Revert "use min_by"

This reverts commit 33042f4.

* Revert "Revert "use min_by""

This reverts commit 1d2204f.

* trigger CI

* Revert "trigger CI"

This reverts commit 259d91b.

* new day, new clippy warning

* more clippy issues
serban300 pushed a commit to serban300/parity-bridges-common that referenced this pull request Apr 8, 2024
)

* update Substrate + Polkadot + Cumulus refs

* Origin -> RuntimeOrigin

* weights v1.5

* update refs once again + `cargo test -p pallet-bridge-grandpa` works

* started work on `cargo test -p pallet-bridge-messages`

* cargo test -p pallet-bridge-relayers

* cargo test -p pallet-bridge-parachains

* cargo test -p millau-runtime

* cargo test -p bridge-runtime-common

* cargo test -p rialto-runtime

* cargo test -p rialto-parachain-runtime

* cargo test -p millau-bridge-node

* cargo test -p rialto-bridge-node

* cargo test -p rialto-parachain-collator

* cargo test -p messages-relay

* cargo test -p parachains-relay

* cargo test -p substrate-relay

* cargo test --all

* cargo check -p millau-runtime --locked --features runtime-benchmarks

* fix remaining test

* fmt

* try to allow clippy failure temporarily

* Revert "try to allow clippy failure temporarily"

This reverts commit d1b6593.

* use min_by

* Revert "use min_by"

This reverts commit 33042f4.

* Revert "Revert "use min_by""

This reverts commit 1d2204f.

* trigger CI

* Revert "trigger CI"

This reverts commit 259d91b.

* new day, new clippy warning

* more clippy issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants